From e9bb68a99b62baa638cadc587416471d11017c0f Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 8 Oct 2009 08:48:52 +0100
Subject: [PATCH] xsm: Correct the usage of XSM_ENABLE after c/s 20285.

Signed-off-by : Machon Gregory <mbgrego@tycho.ncsc.mil>
---
 xen/xsm/Makefile     | 2 +-
 xen/xsm/xsm_policy.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/xen/xsm/Makefile b/xen/xsm/Makefile
index 725f98e377..02f55d8e1a 100644
--- a/xen/xsm/Makefile
+++ b/xen/xsm/Makefile
@@ -1,6 +1,6 @@
 obj-y += xsm_core.o
-obj-y += xsm_policy.o
 ifeq ($(XSM_ENABLE),y)
+obj-y += xsm_policy.o
 obj-y += dummy.o
 endif
 
diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
index f1e8bd27ce..2919c1a699 100644
--- a/xen/xsm/xsm_policy.c
+++ b/xen/xsm/xsm_policy.c
@@ -19,7 +19,6 @@
  *
  */
 
-#define XSM_ENABLE
 #include <xsm/xsm.h>
 #include <xen/multiboot.h>
 
-- 
2.30.2